code cleanup
avoid redifining pwd
Merge pull request #667 from mozilla-services/cleanup-get-working-dir

cleanup get_working_dir()