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

Conflicts:
	Elision/.classpath
	Elision/src/ornl/elision/core/AtomSeq.scala
	Elision/src/ornl/elision/core/BasicAtom.scala
	Elision/src/ornl/elision/core/Operator.scala
	Elision/src/ornl/elision/core/matcher/SequenceMatcher.scala
	Elision/src/ornl/elision/parse/Processor.scala
Merge branch 'master' of https://github.com/sprowell/elision

Conflicts:
	Elision/src/ornl/elision/parse/Processor.scala