moving toward doing a travis-tarbell build

Reset master branch to before this travis build-related stuff. These are all the changes I made, trying to get this to work. It doesn't really work yet.