Bringing in misc stuff from windows machine
Begin to customize backup settings
dos mode and work on init.el
Merge branch 'win' into mac

Conflicts:
	init.el