add hosts
ignore sublime files by default
upgrade linter
merge from upstream