Monokai v2

Merging changes from Monokai v2 production branch into master.