Merge pull request #59 from stevemer/master

#33, #45, #49, Regression testing
Merge pull request #60 from stevemer/master

Fix line numbers to be useful (small change)
deleted a line that sorted - I'm a dummy
reverting
reverting
configparser -> ConfigParser