Back-merge docs and example image changes from `master` to `dev`
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Thu, 10 Apr 2014 00:11:49 +0000 (17:11 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Thu, 10 Apr 2014 00:11:49 +0000 (17:11 -0700)

Trivial merge