Improvements to error message correctness
Fixed paths in error messages
More fixes for correct errors
Merge branch 'master' into scala-2.11

Conflicts:
	src/macros.scala