Clean + Travis
Merge pull request #8 from simi/travis+clean

Clean + Travis