Adding in a notes test
Updating deplay script to deal with folders
Merge branch 'master' of github.com:NottingHack/history