Add some really basic tests for pycon apps
Merge branch 'develop' into feature/6-basic-tests

Conflicts:
	README
Fix README that I didn't merge quite right
Merge branch 'feature/6-basic-tests' into develop