Update Vue to 0.10.6, fix typos
Clean up the merge