smspassword
Merge branch 'develop' into feature/issue-173-moar-tests

Conflicts:
	oneplus/tests.py
revert settings
remove sms post
Merge pull request #146 from praekelt/feature/issue-173-moar-tests

smspassword