Add Kalisi, improve color scheme functions
Merge branch 'master' of github.com:jdavis/dotfiles