Added travis config
Trigger travis
Fix version for travis
Merge branch 'master' into jeff