Makes the _config.yml deploy to a separate directory for staging
Makes the _config.yml deploy to a separate directory for staging
Updates the _config.yml to match expected destination on staging server
Merge branch 'staging' of github.com:18F/dashboard into staging

Conflicts:
	_config.yml
Adds hookshot and fabfile for the deploys
Updates with a proper destination directory
Testing commit hook
Reverting webhook test file
Fixes the json generator
Enables travis on other branches (staging-production PRs)
Merge pull request #139 from 18F/fix_generator

Fix generator