emacs: Hack to load in mailcap
emacs: Try to add CEDET autocomplete
zsh: Comment out ROS sources
emacs: Add emacs24-client desktop file
Merge branch 'master' of github.com:ehuang3/dotfiles

Conflicts:
	emacs24-client.desktop
	zshrc