Removed travis files (I'm not sure how to do unit testing yet)
Merge commit '3d39e0cf28ea73f38b5f028ed0ffb1144d7f6a99'