Updated init.el
Fixed merge I think
Added init.el.org