Necessary file changes for deploying with Capistrano
Merge branch 'master' of https://github.com/andrewberls/crowdcode

Conflicts:
	Capfile