Add tests and tweaks for User.name and User.casual_name
Fix redirect back to app after expired password reset
Add rake task to import users from a csv file
health check controller method and route, made Gemfile ruby 1.8 happy for AWS, added recent AWS cookbooks into Berksfile to better imitate production environment
Merge pull request #37 from jpslav/health-check

health check controller method and route, made Gemfile ruby 1.8 happy fo...
Merge pull request #36 from karenc/import-users

Import users
Allow users to logout without accepting terms; Require terms on apps page
Hide sign up from users coming from CNX
Fixes specs broken by the addition of fine_print to the applications controller; Adds a spec to test for the fine_print redirects in that controller
Merge pull request #44 from Dantemss/logout_fix

Allow users to logout without accepting terms; Require terms on apps page
Added a feature test for hiding sign up from CNX users
Changed Sign Up case to match Sign in; Changed specs to conform to new case
Merge pull request #45 from Dantemss/from_cnx

Hide sign up links from CNX users
cleaned up views and styling, changed google+ icon to google icon, don't freak out if somehow users have already agreed to terms before finish registration (I did that somehow)
Merge pull request #46 from jpslav/issue-41

Style/view fixes, normal google icon, go with flow is user already signed terms on registration