Refactors for new authentication routes

@jamesongamble - we're not using Q and jwt modules.  Can you remove them here?