alias updates
remove ff only
Merge branch 'master' of https://github.com/davehooper/dotfiles into macbookair

Conflicts:
	aliases
	gitconfig
add aliases
update path
Merge branch 'macbookair'