Arnar: Travis ready
Merge branch 'master' of github.com:MrKumalo/Kumalo