improving mercury editor
Merge branch 'master' of github.com:aitherios/startae-bootstrap