WEB-321 added tests for chooseTemplate; very sparse template mapper
updated todo.org
added *~ files to gitignore
WEB-321: non-context-aware template chooser is complete
Merge branch 'master' of github.com:benbreedlove/smokejs

Conflicts:
	todo.org