re-init
Merge branch 'master' of github.com:stucco/ontology-editor

Conflicts:
	.gitignore
	.jshintrc
	Gruntfile.js
	app/scripts/models/network.js
	test/spec/test.js
hint fixes