Merge pull request #631 from jmaas/master

Add Christopher Johnston to AUTHORS