Cleanups, and email addresses
Merge pull request #1 from jesperpedersen/cleanups

Cleanups, and email addresses