Updated Tool's ToolTypes to current tools. Also added recognition of
current tool, so when you click on a tool in the tool bar, it sets the
currentTool to the appropriate tool.
Last commit didn't show up, trying again