Add travis build icon!
I am not a smart man...
Merge remote-tracking branch 'upstream/master'