Squashed commit of the following:

commit 75156646d2b460deeb8038fb5317c7e9b4f04c85
Author: Yang Wang <ywangd@gmail.com>
Date:   Sun Dec 21 13:18:25 2014 +1100

    More stash dot files to ignore.

commit 8f65561e549267e48d45f7de6b1d56208d62f0d6
Author: Yang Wang <ywangd@gmail.com>
Date:   Sun Dec 21 12:22:32 2014 +1100

    enclosing_aliases and enclosing_cwd should be handled in the same way as
    enclosing_envars.
Merge branch 'dev'
Merge branch 'master' into dev