Minor cleanup and continued work on ex. 2

(Material pushed to github using:
git add
git commit
[jgoldste@gcis-dev-back (master) Tuba]$ git pull --rebase usgcrp/master
(git rebase -i usgcrp/master will cause some commits not ready to be pushed to be rebased).