added in some Guardfile stuff, upgraded to latest rails, all tests are passing