updated .gitignore
Merge branch 'master' of https://github.com/j105rob/scram

Conflicts:
	twistd.pid