Fix npm
Merge branch 'npm' of https://github.com/zimme/dm-countries into zimme-npm

Conflicts:
	server/countries.coffee
Added .npm to .gitignore
Merge branch 'zimme-npm'