massive JS refactor to make it readable. ternary is dumb and jake is a real douche
Merge branch 'master' of https://github.com/hfuller/Pilgrim - clobbering Molloy, sorry

Conflicts:
	js/functions.js