Revert "Revert "1.3.1 update - new commands, cleaned up code, misc. commands usable from console""

This reverts commit 8c9545b2b625e1c575877d769434f37b7e399e2e.
Revert "1.3.1 update - new commands, cleaned up code, misc. commands usable from console"

This reverts commit ae7a42e0a7824f84f8775a83d8e6250d194902f0.

Conflicts:
	.classpath