Merge essentialy to try out travis

Let's try the travis config file with a dummy merge from dev to master