Hash class, collect uses Hash.expand() method, much cleaner, reusable parsing
Merge branch 'master' of https://github.com/jbielick/cakejax

Conflicts:
	cakejax.js