unify .bash_profile and .zprofile
ssh-reagent
rvm line in zshrc
vim-scala, remove github plugin
no ex mode or ri check
[bash] retab
git ap
[sh] ey-meta alias
[git] git add -p = gap
auto whitespace trim
require prynav for commands
[bash] alias rff
[bash] pretty_json
[bundle] --jobs 5 default
ruby >= 2.0 HEAP tweaks
upgrade pathogen
[vim] add syntastic
Merge remote-tracking branch 'origin/master'

Conflicts:
	bash/alias
	vim/bundles
	vim/vimrc
	zsh/zshrc