Merge branch 'master' of github.com:danielcrenna/tophat

Conflicts:
	push-nuget.bat
	tophat.nuspec