MNT: Changes based on skxray refactor
MNT: Fixed some demos and removed obsolete ones
MNT: Unrefactored an overzealous refactor
Merge pull request #43 from ericdill/skxray_refac

MNT : Skxray refac