Update to rails 4.0.3

Conflicts:
	Gemfile.lock
Update to ruby 2.1.1
Update to rails 4.0.4
Update .travis.yml
Update to rails 4.1.0
Add before script to .travis.yml
Merge pull request #29 from ruedap/staging

Update to rails 4.1.0