Squashed commit of the following:

commit 75fa59ce6b809284830e3c578ae741bc9145c22b
Author: Cameron Bulock <cameron@bulock.com>
Date:   Sat Apr 12 16:19:28 2014 -0400

    changes to have thumbnails are displayed