adding devel branch to Travis build
Merge branch 'devel'
fixing travis yaml config