brew bash completion for os x
update gitconfig so github starts associating my commits properly
Merge remote-tracking branch 'origin/master' into work

Conflicts:
	gitconfig
vim config for scala
Merge branch 'master' into work