Upgraded rails to 3.2 and fixed issues resulting from the upgrade
Merged rails upgrade branch and updated some of my contact details