Did my best to rebase. Now includes the latest changes made to devel, along with my change of adding category option to module
Did my best to rebase. Now includes the latest changes made to devel, along with my change of adding category option to module

thaim/ansible,thaim/ansible