Updates ignore to cover Mac OS X and npm files
Merge branch 'master' of github.com:BotBotMe/botbot-web into botbot-2.0

Conflicts:
	.gitignore