Merge branch 'castor/alpha' of github.com:brennonbrimhall/gemini into castor/alpha
Merge branch 'master' into castor/alpha