Merge pull request dustinfife#48 from dustinfife/development

Merge dev into master post plot.types

put all .Ringore stuff back (because I couldn't get it to work)