Updates data calls to ng factory.  Uses promises.  Has basic login stuff working, but need to test basic auth.
Merge remote-tracking branch 'origin/master'