Update alias for popd pushd and .marslorc
Merge branch 'master' of ssh://github.com/Marslo/LinuxStuff