Boring but necessary; keep config.py away from commits
Merge pull request #168 from teslaworksumn/config

Boring but necessary; keep config.py away from commits
Merge branch 'master' into sassy-spassov

Conflicts:
	.gitignore