prepping to build a release
Merge https://github.com/EvilTeach/TFV

Conflicts:
	.gitignore