Prepare for releasing 0.5-M2 for 2.11.0

Conflicts:
	project/Build.scala
Update travis config to use scala 2.11.0
Merge pull request #76 from DarkDimius/0.5-M2

Prepare for releasing 0.5-M2 for 2.11.0-RC3