Ignoring mac specific things
Merge branch 'master' of github.com:guardian/pa-browser

Conflicts:
	.gitignore