Clean up and add .gitignore
Merge pull request #1 from chaosagent/master

Clean up ~ and add .gitignore