Upgrate to rails 4.1

Refactoring