Changed color scheme
Merge branch 'master' of https://github.com/varp/dotfiles

Conflicts:
	sublime_text2/Preferences.sublime-settings
Merge branch 'master' of https://github.com/varp/dotfiles

Conflicts:
	sublime_text2/Preferences.sublime-settings
Merge branch 'master' of https://github.com/varp/dotfiles
added vimrc to config.yml