for fix commit
Merge remote-tracking branch 'origin/mac'
fix flymake setting
add org setting
fix/add tabbar setting
fix tabbar setting (again!)
Merge branch 'master' into mac

Conflicts:
	init.el