Minor modifications to Using Unix
Minor changes to various using docs
Committing conflict resolution for Using Unix