f90a9aa0

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into merge-go-app-starter