update vim bundles a bit
touch up bin scripts, add some for new prompt
new theme + syntax highlighting
some new git aliases
ssh config
Merge branch 'master' into works-in-mac

Conflicts:
	ssh/ssh.symlink/config
	vim/vim.symlink/bundle/scss-syntax.vim/example.scss
	vim/vimrc.symlink
powerline
for ubuntu
updated vundles