Textile doesn't need editor rule
Time icon was missing
Consistent order
This is not an upcoming feature anymore
Merge branch 'master' of https://github.com/philwareham/hive-framework

Conflicts:
	.editorconfig