wip
Merge branch 'dev' of github.com:ebattenberg/ggmm into dev

Conflicts:
	gpu.py
	test_ggmm.py