Rubytwo

This builds on top of the other PR.  Check the last two commits or so to see the changes over rails 4 upgrade.

I've changed us over to ruby 2.0 and to use byebug.  Simply insert byebug in either development or tests and it will drop into the debugger.