Squashed commit of the following:

commit c522a0235520733992eb9c41d118747d25e984cb
Author: Austin Krill <AKrill91@gmail.com>
Date:   Thu Feb 6 17:44:34 2014 -0500

    Image types changed