excised the type language, made the makefile more precise
un-broke the ability to quote scalars
Merge remote-tracking branch 'origin/master'