Minor formatting changes.
Update libraries.

Rails 3.2.19, git 1.9.4, sqlite 3.8.6, mysql-5.6.20
Merge branch 'master' into 3.0.0