Merge branch 'idrisdoc' of github.com:PhilipRasmussen/Idris-dev into PhilipRasmussen-idrisdoc

Conflicts:
	src/Idris/AbsSyntaxTree.hs
	src/Idris/REPL.hs
	src/Idris/REPLParser.hs