Moved aliases to separate file
Merge branch 'master' of https://github.com/jaredculp/dotfiles

Conflicts:
	.bashrc