osx tmux
add .z file
Changed tmux status bar color
Added pry binding snippet
Merge branch 'master' into osx

Conflicts:
	.tmux.conf
Fixed path and rbenv stuff in zshrc
Added git push aliases
Conditional in .zshenv
Changed g p to push
Added git plugin
Added hamlc and fixed anaf snippet
Switched solarized theme around for nicer term vim
Solarized light for term
Added a bunch of shit. sorry, read the list
Merge remote-tracking branch 'origin/master' into osx

Conflicts:
	.vimrc
Set colorscheme crap for tmux... :(
Initial setup for prezto
Updated install
view ain't workin so well
Updated .vimrc a lot