Fix indentation in wiring
Strip trailing whitespace when appending usemin blocks
Increase Mocha timeout because of slow Bower registry

Also upgrade Mocha
Upgrade deps