Switched to a develop branch
Fixed bug with pip install
Merge branch 'develop'

Conflicts:
	provision/cookbooks/webapp/recipes/jenkins_master.rb