Updates to TinkerPop 2.6

Had to add another feature to support some changes -- Again mostly whitespace issues