Don't try to do osx-plist stuff if the file isn't there in the first place.
work checkpoint
Delete GPLv3
prog-mode extensions
Various settings
More prog-mode tweaks
Turn off the flymake stuff
.mm files are ObjC
w3m settings
Don't commit apple-specific settings
Merge branch 'master' of http://github.com/dabrahams/dwamacs

Conflicts:
	settings/code-settings.el
	settings/compile-settings.el
	settings/settings.el
	startup/99-sugar.el
Merge branch 'master' of http://github.com/dabrahams/dwamacs

Conflicts:
	settings/code-settings.el
	settings/settings.el
	settings/system-type-darwin-theme.el
	startup/99-sugar.el