more complete editor
Merge pull request #232 from aztec8/master

more complete editor - ready for article mako templates