merge fix for tests
remove test of stuff from other branch
fix test (only affects Teamcity or Python 2.6??)
Merge pull request #8 from matey-jack/master_ahead

make status.py unit-testable and add unit-tests
merging from upstream (conflicts due to double fixes in previous pull request)
prettier line breaks