Updated to Rails 3.2.13.

http://weblog.rubyonrails.org/2013/3/18/SEC-ANN-Rails-3-2-13-3-1-12-and-2-3-18-have-been-released/
Merge branch 'hotfix/20130319'
New schema re-write
Merge remote-tracking branch 'origin' into feature/betteruserupload
Some migrations I forgot to add.
Merge branch 'feature/betteruserupload' of https://github.com/scholarslab/prism into feature/betteruserupload

Conflicts:
	app/views/prisms/new.html.erb