prepare for integration with travis
Merge pull request #151 from thorbenk/travis

prepare for integration with travis