Merge branch 'master' into linuxmint

ansible.cfg

@@ -1,5 +1,4 @@
 [defaults]
-# (pathspec) Colon separated paths in which Ansible will search for Roles.
 roles_path=~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles:roles
 inventory=inventory
 vault_password_file=./.vault_password
@@ -7,3 +6,6 @@ playbook_dir=playbooks
 
 [privilege_escalation]
 become_ask_pass=true
+
+[diff]
+always = True