upgrade to rails 4
Merge changes from madha14