minor warning fixes
Merge branch 'master' of github.com:MadrMan/jhPrimeminer

Conflicts:
	src/primecoinMiner/main.cpp