remove the w32-browser code for now, will have to hack it locally
fix some merge differences (blank lines, go figure)
clean up header info, add new custom theme
a lot of changes since the last commit, namely removed lisp code (for now) and added ergoemacs bindings