Added travis file
Indentation
Added travis status image
Upped version number for travis
Merge branch 'feature-travis'