Cleanup templates and fix #49
Merge branch 'master' of github.com:tpetricek/FSharp.Formatting