updates from rescomp
Merge branch 'new' of ssh://github/justjake/Dotfiles into new