Refactor for Toolbar, Java7, and cleanup

Refactored Editor/EditorToolbar to allow reordering. Java 7
compatability: Added type parameters to generics, @SuppressWarnings as
needed. Cleaned up some unused code and memory leaks.