Improved travis
Better travis branch handling
Merge branch 'master' into development