delete .emacs and .bashrc
 Merge branch 'master' of github.com:dwenomo/settings

Conflicts:
	.emacs.el