Upgraded rails to 3.2.14.rc2
Updated Gemfile.lock file
initial rails 4.0.0 port changes
Merge branch 'rails4' into railsify