moved to EC2
Merge branch 'master' of github.com:tharris/wormbook
bringing repositories up-to-date
Merge branch 'master' of github.com:tharris/wormbook
removing httpd.conf from source control