Added Travis icon
Merge branch 'master' into scala-2.11
Updated travis details