don't focus block on Editor initialization with data
Use lowercase type for consistency
Merge pull request #241 from Lostmyname/master

Use lowercase type for consistency
Merge pull request #234 from MaximDubrovin/patch-1

Don't focus block on Editor initialization with data
Ran grunt to update concat/minifed versions
Merge pull request #242 from Lostmyname/master

Ran grunt to update concat/minified versions
+pass block var to the compiled template instead of as the second parameter to the _.template function. Was throwing an error before and not rendering the UI for droppables.
Merge pull request #246 from monological/drop_fix

Blocks using droppable mixin throwing errors when rendering UI
Merge remote-tracking branch 'madebymany/master'

Conflicts:
	sir-trevor.js
	sir-trevor.min.js
	src/sir-trevor-editor.js
Restores the format bar.
Restores the block-ui.

Also fixes line-height bug for empty blocks by adding a min-height.
Reduces the annotation margin and padding to sane defaults.