Added span in parser state
Upstream updates to idrislang.sty

+ Fixed braces problem.
+ Removed clutter from file.
+ allowed for a static indent for xleftmargin.
Merge branch 'master' of https://github.com/idris-lang/Idris-dev into feature/parserspanning

Conflicts:
	src/Idris/ParseHelpers.hs
Prepared data structure of FC for spanning, and added the span of the
last token parsed to Idris
Fixed error reflection bug after change of sourcelocation definition
Unification tweak; better disambiguation

Fixes #963. Do alternatives after normal arguments so that more type
information is available.

(Ideally, order shouldn't matter - would be better to retry alternative
resolution if there were still ambiguities at the end, but this will be
fiddly to set up as things currently are.)
Merge pull request #964 from jfdm/idrislang

Upstream updates to idrislang.sty
Merge pull request #965 from ahmadsalim/feature/parserspanning

Preparation for spanning of source code in parser
Merge branch 'master' into TailRecursiveFoldR

Conflicts:
	src/Idris/IBC.hs
	src/Idris/ParseHelpers.hs