Update nxhtml to master
Update magit to 1.2.0