Add travis icon
Merge branch 'refs/heads/master' into zamqp