Forgot to commit, merging.
Merge branch 'master' of github.com:rockwolf/emma

Conflicts:
	emma/modules/calculator.py

Merge fixed.