Editor

This merge updates master with most up to date editor, interpreter, and keypad.