atlasrs
skipfish
emacs theme
vim bundles, themes
Merge branch 'master' of github.com:ashleyblackmore/dotfiles

Conflicts:
	bashrc