Update readme
Merge branch 'master' of https://github.com/Elefrant/elefrant.git
Update travis file