Merge pull request #2 from chaosagent/master

More fixes/things
Update gitignore