don't be a jerk, don't monkey-patch sass maps
Merge remote-tracking branch 'upstream/master'
whitespace cleanup after upstream merge
fixing doc blocks for recently added methods
Merge pull request #50 from eoneill/master

stop abusing Sass maps