pep8 fixes
Added badges

Conflicts:
	oneplus/views.py
Merge pull request #84 from praekelt/feature/issue-63-badge-fix

Feature/issue 63 badge fix