Unmap ctrl-z.
Merge branch 'master' of https://github.com/smeredith/dev