Merge pull request #3 from maurizi/fix-travis

Fix Travis CI tests
Trying butterknife. Tests are back?