Trying to fix issue #173.

Every block is finished with it's own name.
Fix merge conflict. Remove extrajs block.
Merge pull request #177 from audreyr/develop

Merge in @paurosello's commit