Massive updates due to feedback. Travis stuff should work now as well.