Upgrade to ASM 5. This fixes indexing of Java 8 classes. Also, handle more exception types when reading files during index startup.
Fix missing import.
Add tests of java 8 class file indexing.
Merge pull request #503 from aemoncannon/fix-indexer

Upgrade to ASM 5.
silence the presentation compiler
Merge pull request #508 from fommil/silent_prescomp

silence the presentation compiler
scala 2.10 is now a secondary branch
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