Merge pull request #1 from rnirnber/dnd_selection

My first PR merge
Cool...this is way cleaner now...should be ready to close five-three-one unless further changes requested.
Made improvements to node expansion timer as suggested
Merge pull request #2 from rnirnber/testing_rebase

Made improvements to node expansion timer as suggested
Merge pull request #3 from rnirnber/master

Syncing all other forks with master