Condensed some conditionals
"Fixed" the null entry bug
Moved to KeySequence implementation from DPCommons
Merge remote-tracking branch 'origin/master'