ensure fsharp-mode-hook is run
Merge pull request #11 from chrisbarrett/fix-hook

Ensure fsharp-mode-hook is run
fix merge conflict