Travis ci

Merging dev branch into master, adding support for travis CI