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 nginx settings for optional password/restricted setting
Add database command to deal with permissions issue when testing
Add setting for default server restriction (default none)
Add default setting for server restriction (default none)
Create password from using apache htpasswd command
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
Merge pull request #181 from notthatbreezy/topic/staging-password

Topic/staging password