updated indent settings
Merge branch 'master' of github.com:natemara/.emacs.d

Conflicts:
	init.el