Merge pull request #138 from khinds/master

fixed #136, pagination controls are now properly formatted
Fix for CVE-2013-0156
update rails due to the two CVEs