Added test for friendly_datetime
Merge branch 'improve-coverage' into coveralls

Conflicts:
	testproject/requirements.txt
	testproject/tox.ini