Merge branch 'master' into develop
Remove July 2013 usability testing text from the homepage and the help page, fixes #4029
Merge branch 'hotfix-1.7.1' into develop
adding .idea to gitignore for RubyMine
adding hotfix for email routing back to dev
capification of SS
adding whenever config
capistrano needs rspec for deployment
capistrano needs cucumber for deployment
wheneverifying cron jobs
passenger bombs on a long temp path
have gem whenever deploy to role :app
adding resolrize back into deployments
added demo + production role files for capistrano
version 1.8 with security fix and capistrano deployments
added version number to version page
updated version page
fixing the blue banner on the footer and small form fields, moving the landing page css to only be included on landing pages.