Rails4.1

Updates for Rails4.1