Incorporate Current Stable Toolbar Branch Into Master

The current toolbar branch is the most stable branch in this repo. Merging this into master will provide a stable platform for further development when I leave on Friday.  :) I will miss you guys!