cleanup & quoting

Addresses a few issues:
* The current code determining SCRIPT_DIR actually does a "cd"... which is then followed by a cd.  Unnecessary.
* SCRIPT_DIR needs to be quoted, as it can contain spaces.
* We should only reference `dirname "${BASH_SOURCE[0]}"` in one place.