Merge pull request #5 from luminousfennell/master

Fixes from work
Fix up dired
Fixes for dired-fm