Cleanup
Try and figure out whats going on w/ travis-ci