ring commit
Merge branch 'master' of https://github.com/tjlane/odin

Conflicts:
	src/corr/correlate.cpp
	src/python/xray.py
	test/test_xray.py
Merge branch 'master' of https://github.com/tjlane/odin
Merge branch 'master' of https://github.com/tjlane/odin
ring push