lists update to sass 3.3 maps and huge cleanup #2