Updated Travis details
Merge branch 'master' into scala-2.11
Updated Travis details