Upgrade to rails 4

So I thought this was a no brainer, but I upgraded from rails 3.1 to rails 4.0.2 just for our sake. Check it out and merge if you want, I haven't merged yet on my end to master yet. Thought I'd let you see first. Enjoy!