updated to emacs 24
Merge branch 'master' of github.com:skoleckm/emacs-configuration

Conflicts:
	.emacs
in python C-c C-c should now work for comment/uncomment region