Periodic synchronization between init.el on Linux and Windows.
Updates to basic structure.
Synchonize (as appropriate) between Windows and Linux.
Synchronizes between Linux and Windows.
Merge branch 'master' of github.com:Choens/.emacs.d.lin

Conflicts:
	lisp/misc.el