FINALLY, fixed dependency/requires issues

Sorry, I basically broke the dependencies with my last fork.  This should actually fix it all.  Tested it with dev and production modes (heroku) with a Rails 4.0 app.