Cleanups
Merge branch 'Rails4'
Remove puts