start playing with travis
Merge remote-tracking branch 'upstream/master'
Merge pull request #39 from fluffy/travis1

Adding Initial config file for Travis