Major redesign: minimalistic and experimental
Merge pull request #2 from capshaw/redesign-fall-2014

Major redesign: minimalistic and experimental