Improvements and coffee mode
Merge branch 'master' of http://github.com/DevanandReddy/emacs-settings

Conflicts:
	emacs.d/elpa/htmlize-20130207.1202/htmlize-autoloads.el
	emacs.d/elpa/htmlize-20130207.1202/htmlize-pkg.elc
	emacs.d/elpa/htmlize-20130207.1202/htmlize.elc
	emacs.d/lisp/global.el
	emacs.d/lisp/init.el