Merge pull request #23 from joeljfischer/development

Merge Dev into master
Check for "next" on CodeMirror

Signed-off-by: Joel Fischer <joel@livioradio.com>