more refactoring with features in 0.3.0
Merge branch 'master' of github.com:iceddev/breakouts

Conflicts:
	breakouts/frozenjs/package.json