Added library directory discovery (removed hardcoded paths)

 - This was also included in the shell hook launchers to make them more DRY
Merge remote-tracking branch 'origin/master'