Merge branch 'hotkeys+tooltips' of https://github.com/Fishrock123/mondrian into tooltips

Conflicts:
	src/tools/zoom.coffee