Added test for no format types
Fixed merge issues
Merge branch 'master' of https://github.com/grefly/editor