Adding env support for non login shells
Fixing HEREDOC syntax
Bugfix: add missing depends
Enhancement: add spec to confirm this is working

 * also confirms the bugfix I committed