Only build travis on master.
Merge branch 'master' into clock
Clock basics fully functional