Hopefully fix travis tests
Merge branch 'master' of https://github.com/mtford90/silky