enhancements to scripts, rename myl templates for train and classify
fix dictionary iter bug in fromfilecatalog
default to using make -j instead of distcc_make in the GrappalangRunner
fix printing poor man's assertions
settle on y not year in naivebayes scheme
Merge branch 'bmyerz/multi-key-join' of github.com:uwescience/raco into bmyerz/multi-key-join

Conflicts:
	raco/catalog.py
Merge branch 'bmyerz/multi-key-join' into bmyerz/refactor-templates