Added Travis CI build config
Merge changes from master