Making power strip sign up copy less aggressive per #148
Now using HTTPS API endpoint for Twitter
Added more details to Twitter app registration comment
Added dependency check for JSON module, closes #150
Making password and salt optional (for accounts that only have 3rd party auth, for example)
Merge branch 'master' into subscriptions

Conflicts:
	dbupgrade.php
Merge branch 'master' of git://github.com/StartupAPI/users into subscriptions