Fix bash locations
Merge branch 'user-tweaks'