bug fixes based on user tests
Merge branch 'master' of https://github.com/alarie/Hofnahrr
capistrano