Add .gitignore and elpa setup in init.el
add submodule for orgmode-mediawiki
Mediawiki-mode
Install org-octopress. At this point, using only the Jekyll exporter, ox-jekyll.el
Merge branch 'win' into mac

Conflicts:
	.gitignore
	.gitmodules
	init.el

Merge in changes that were made for Windows that also apply to OSX
Update solarized theme, modularize init code, and add functions to toggle between dark and light