Updates to task specification.
Fixed merge.

Merge branch 'master' of https://github.com/smc77/rlglue

Conflicts:
	R/taskspecparser.R