Merge branch 'master' of github.com:b-ryan/dotfiles
markdown plugin
alias for ruhoh
Merge branch 'master' into work

Conflicts:
	bash_aliases