placekitten stopped working, switched to placehold.it
Merge branch 'master' into gh-pages

* master:
  placekitten stopped working, switched to placehold.it