Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/bundle/vim-coffee-script
	vim/bundle/vim-fireplace
Run rcup with system so it is appropriately interactive
Add copy to clipboard goodness to tmux