Merge pull request #78 from matthewp/tabsize

Add delay before focusing on search, tabsize setting.
Change default tab size to 8.
Refactor changing tabsize.
Merge branch 'upstream' into theme

Conflicts:
	app/js/settings.js
	app/js/tabs.js