cleaning up shell stuff, shell agnosticism
mergie fixing
Merge branch 'master' into fedora-x86_64-dynamis