Stop loading pymacs everytime a python file is loaded.
Added ignore, turn subword mode on for python mode.
Got rid of tabs by default for python.
Updates from work.
Tweaks.
Merge remote-tracking branch 'origin/master' into yelp

* origin/master:
  Tweaks.
  Updates from work.
  Got rid of tabs by default for python.
  Added ignore, turn subword mode on for python mode.
  Stop loading pymacs everytime a python file is loaded.

Conflicts:
	init.el