Update Rails to 3.2.13 (security)
Merge branch 'master' of https://github.com/chaosdorf/mete

Conflicts:
	Gemfile.lock