Pull consolodation

this consolodates a few pending pull requests (#5,#14,#15 & #18) in cgoldberg/master
 - minor bug fixes & additions for tox/travis-ci based testing.