First merge

Hi Ben,

Take a look at my changes. I had to delete 01_site.rb to get my version to work. I think this is because of the attempt to open site.yml which I did not have in my config folder.

- Jon