updated travis to build stable-0.4 and master
Merge branch 'stable-0.4'