ignore bower and npm directories
shuffle order of deploy permissions commands
Merge branch 'master' into build

Conflicts:
	.gitignore