Update .gitignore
Merge branch 'master' into lines-and-columns
Update package.json and one more line in dust.pegjs
Make the items which include lin/col more consistent
Clean up the .gitignore file changes

I had attempted to change the .gitignore to remove a directory within node_modules/, but it turned out the .gitignore was correct. The directory had been force-added, so I had to remove it, which I did in a separate PR.
Merge pull request #309 from smfoote/lines-and-columns

Add lines and columns to dust.pegjs