before merge
Merge branch 'master' of https://bitbucket.org/mmalcomson/useful-programs
new colorscheme, midified from github colorscheme