Switch back to haskell-mode master
Update shm