added generator-mocha as peerDepenency, bump to 0.1.4
updated bundled modular-scale gem to work with the latest compass+sass
updated vars
bump to 1.5
initial changes to upstream
commit after merge upstream