Pull in Haskell.nanorc changes and todo.txt nanorc