default capistrano
couple of changes to capfile
Merge branch 'capify' into controllers