updates internal dependencies
merges with origin/master
updates to rails 3.2.12