separate scala-2.10 branch
Pre-requisite changes for 2.11 that are applicable to 2.10.
Changes specific to Scala 2.11.
Merge pull request #512 from marcsaegesser/2.11-b

Support for Scala 2.11
Handle differences between RangePositions and OffsetPositions.
Merge pull request #514 from marcsaegesser/PositionFix

Handle differences between RangePositions and OffsetPositions.
Semantic highlighting tests
Merge pull request #519 from edani/sem-high

Semantic highlighting tests
Initial work to add integration style tests.
Merge pull request #515 from rorygraves/intg_tests

Initial work to add integration style tests.
Fix #437.  Do not fetch symbol source location when listing type members
Merge pull request #523 from edani/symbol-info

Fix #437.  Do not fetch symbol source location when listing type members
Merge remote-tracking branch 'upstream/master' into scala-2.10

Conflicts:
	.travis.yml
Revert "Changes specific to Scala 2.11."

This reverts commit d6bee9f9a338f9ffecbe8f1c4bd525e2fd61f5b6.
Merge pull request #524 from fommil/scala-2.10

backport recent changes to Scala 2.10