Merge master into sign-up

travis enhancements