cleanup
Merge branch 'master' of https://github.com/joshlawrence/misc
trying to clean up the bash script mess.