Merge pull request #4 from stevenhoneyman/master

Some more improvements
Updated .gitignore to ignore *~ files