Merge branch 'clojure-port' of github.com:OpenPplSoft/OPS into clojure-port

Conflicts:
	src/com/enterrupt/Main.java
Merge branch 'clojure-port' of github.com:OpenPplSoft/OPS into clojure-port

Conflicts:
	src/com/enterrupt/Main.java