Merge pull request #46 from agmps18/rails-4

Rails 4 port
Merge remote-tracking branch 'upstream/rails-4' into bootstrap-rails4