added hosts
added js to have two spaces for indentation
Merge branch 'master' of github.com:kaselis/dotfiles

Conflicts:
	.gitignore