fix login, add twitter auth
Merge branch 'master' of https://github.com/piinthecloud/SeeMore-Aquamarine