Added BlockCalculate option, and the condition in all calculate()
Merge branch 'master' of https://github.com/yewlong/New-NeoPI

Conflicts:
	neopi.py