merge with david
Merge remote-tracking branch 'origin/master'
fix twitter bootstrap
convert development to postgres
add dropdowns to sizer form
add collection drop downs to index search
add made_in, fabric_origin, color, brand, selvedge, sanforized to index calculator view