update readme
Merge branch 'master' of https://github.com/mcdickenson/whistle
revert to 6 Sep. 2013 version
fix merge conflicts in master and make shell script for merging