Ignore binary object files

Conflicts:
	vimrc
update vimux and map commands to their new names
Merge remote-tracking branch 'drew/master' into update_for_drew

Conflicts:
	vimrc