bump sbt version
Merge pull request #711 from fommil/scala-2.10

Scala 2.10
use scala 2.11.4 for the master build
revert sbt version bump
Merge pull request #713 from fommil/master

revert sbt version bump
Fix missing line/offsets when looking up symbol positions

Fixes #630
Merge pull request #719 from edani/lines-630

Fix missing line/offsets when looking up symbol positions
Ignore '$$anon$' when indexing java 8 classes. Fix #721
Merge pull request #722 from kopiczko/iss-721-java8-ignore-anon

Ignore '$$anon$' when indexing java 8 classes. Fix #721
revert H2 version
Eliminate config handling in init-project rpc. Fix order of buffered events. Bump protocol version. Remove some dead testing code.
Merge pull request #724 from ensime/init-project

Update protocol to not require passing config in init-project. Bump version & protocol version.
Further work on RPC, update workflow tests
Merge pull request #708 from rorygraves/rpc_refactor2

Further work on RPC, update workflow tests
Use pres. compiler's charset when reading/writing files
Merge pull request #728 from edani/arrow-663

Use pres. compiler's charset when reading/writing files
Merge remote-tracking branch 'upstream/master' into scala-2.10

Conflicts:
	.travis.yml
fixes for the scala-2.10 branch