A bunch of misc updates
Merge pull request #110 from westfieldlabs/misc-updates

A bunch of misc updates