Merge branch 'facelift'

I reset back and used no-ff to preserve commit history of the feature branch. Hope I didn't screw it up...anyway, this merge closes #21, closes #18, closes #17, and closes #14.