Bug fixes.

Made hough a little more intelligent
Merge branch 'master' of github.com:minillinim/GroopM

Conflicts:
	groopm/mstore.py