Move group_vars up a directory

Older versions of Ansible require a different directory structure.
This should hopefully solve a lot of problems with people using
older versions of Ansible.
Merge pull request #178 from notthatbreezy/topic/group-var-fix

Move group_vars up a directory
Add instructions for setting up a password restrict staging server
Merge remote-tracking branch 'upstream/staging' into topic/staging-password

Conflicts:
	deployment/group_vars/jenkins