Merge branch 'master' of https://github.com/sprowell/elision

Conflicts:
	Elision/src/ornl/elision/parse/Processor.scala
Merge branch 'master' of https://github.com/sprowell/elision