Update to jinja2-style variables
Clean up shell aliases