Fix login
Merge branch 'master' of github.com:blakecrosley/openclimate