Added some basic keywords to the executor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/simpletasker/lang/Executor.java