Attempt to get travis to build with hat trie
Merge branch 'master' into feature/hat-trie