Adding the rest of the work that was missing from the last checkin... :)
Merge branch 'master' of https://github.com/jonrosenberg/graphsandbox