Test cleanup
Update bootstrap and travis setup
Typo
numexpr
Merge branch 'master' into verb_matrix