Updated rails to 3.2.12
Fix a derpy extra character in a comment
Update Gemfile.lock to fix fatal dependency issues
Merge branch 'dev'
Merge branch 'master' into feature/ace