Merge pull request #131 from praekelt/feature/issue-align-image

ensure all p and br tags removed from content
Merge pull request #132 from praekelt/feature/issue-align-image

reverse filters
Update oneplus_extras.py
Fixing scenario where a soup object is returned

Fixing scenario where a soup object is returned instead of a string.
add coveralls.io code coverage checks
advertise badges for Travis & Coveralls
fix badge image url
Merge branch 'develop' into feature/issue-align-image

Conflicts:
	oneplus/templatetags/oneplus_extras.py