fix syntax error
Merge branch 'master' into devel

Conflicts:
	configs/futuregrid.json
using macros for scheduler names
updated schedulers
obsession over ascii art....
updated docs
fixed demo