Merge pull request #142 from wltrimbl/2013-06-chicago

2013 06 chicago
removed version-control, changed placeholders to master
more placeholder replacements
Merge branch '2013-06-chicago' of https://github.com/swcarpentry/boot-camps into 2013-06-chicago