Minor deploy improvements
Add ToC
Add note to deploy.rb about .htaccess files
Linebreak fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/deploy.rb
chore(environment): modify database name and add debug variables