Update Rails
Use therubyracerversion that works on Linux
Merge master
Update cards to 2013
Fix tests skipped because of dupe names
Master updates. Try to fix tests.
Merge master