Adds support for returning architecture
Fixes broken mailcatcher supervisord config; closes #897