Cleaned up some configuration and changed vim colorscheme