turned off travis ci for now; remove from readme
Merge branch 'master' into devel