style issues (line-length)...using "Uuid" consistently.

updating dnd_selection with changes from 04-23-14 made in master