Updating from fork with stuff to run Travis