Cleanup:

Remove nxhtml mode from repository
Move magit to use elpa package