Add a few bash aliases, elixir suport
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] bash/aliases
	[resolved] vim/vimrc