Some optimizations.
Gitignore updates
Merge branch 'master' of https://github.com/whiterson/mockingJay

Conflicts:
	engine.py
	tribute.py