Upgrade in progress
Start (trying to) use of asset pipeline
Add thin@
Initial update to calendar to allow filtering
Merge branch 'upgrade_app' of github.com:etskelly/holiday_machine into upgrade_rails4

Conflicts:
	Gemfile
	Gemfile.lock
	config/environments/development.rb
	config/environments/production.rb
Changes to gems
Tidied up sample_data
Changing user settings now only requires password when editing email or password
Remove old css and javascript. Add start of bootstrap styling
Add tests for sign-in
Added new gems
Added validation for name
Fix seeding problems with mass assignment
Add action mailer host
Fix signing up. Add rspec testing.
Fix token authenticatable deprecation issue
Add user editing page and test. Changed some locales
Fix further deprecations
Fix user creation
Cleaned up sample data