Rails 4.0

Card [41](https://trello.com/c/OFgUiuKL) in Trello