Merge branch 'login'
Merge branch 'master' of github.com:jchristianhall/vigor

Master merge