Downgrading rails Gemfile

* From 4.1.1 to 4.0.4
Merge pull request #2 from zalapeach/chore/down_grade_rails

Downgrading rails Gemfile
Merge branch 'master' into feature/travis-integration

Conflicts:
	Gemfile.lock