swapped out placeholder content on a number of posts
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
lots of small updates