Updates for 2014

This addresses all of what was in issue #12 plus a bit more. Starts with @meonkeys first commit and adds a bunch more from me.

Tested locally.