HOTFIX 2015.1 - Various minor variant fixes

Fixed a case where variants would reset to their default values after clicking the update price button, and a case where variant swatches that would cause an invalid combination of variants weren't being grayed out.