cleanup
Merge branch 'master' of https://github.com/harrisitservices/brackets-better-tabs

Conflicts:
	main.js