Updated some names after branching.
Modified colors to match monokai, added more markdown syntax color and a few small tweaks.
Merge branch 'dev'

Conflicts:
	README.md