Started functional, watch group not working.
Caught up to all functionalities.
Merge branch 'master' of github.com:tyricec/map-test into functional-style

Conflicts:
	map.coffee
	map.js