Cleanup recipe database and changes to nginx template
Merge branch 'master' of github.com:eduardodeoh/capistrano

Conflicts:
	config/capistrano/settings.rb