Merge branch 'master', remote-tracking branch 'upstream/master'
first push
removed test
fixed
rings update
fixed conflict in ring_scatter.pyx
Merge pull request #43 from dermen/master

pull me so we can install on odin...