Update to rails 3.2.16 for security patches:
actionpack is affected by the following security advisory:
  2013-12-03 - Incomplete fix to CVE-2013-0155 (Unsafe Query Generation Risk)
  2013-12-03 - Reflective XSS Vulnerability
rails is affected by the following security advisory:
  2013-12-03 - Denial of Service Vulnerability in Action View
Update ruby versions
Merge branch 'fix_git_clean_test' into rails_3_2_16

Conflicts:
	.travis.yml
	Gemfile.lock
Merge branch 'upstream' into rails_3_2_16
Merge pull request #131 from ianheggie/rails_3_2_16

Upgrade to Rails 3.2.16