Merge branch 'master' of github.com:csmith/ansible-config

Conflicts:
	ansible.cfg

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "roles"]
+	path = roles
+	url = git@github.com:csmith/ansible-roles.git

ansible.cfg

@@ -33,7 +33,7 @@ module_lang    = C
 gathering = smart
 
 # additional paths to search for roles in, colon separated
-#roles_path    = /etc/ansible/roles
+roles_path     = /etc/ansible/roles
 
 # uncomment this to disable SSH key host checking
 #host_key_checking = False

roles

@@ -0,0 +1 @@
+Subproject commit f1e7a1d3205eb329287e267748fcc98bd8ddd648