add .metadata to gitignore
Merge branch 'master' of https://github.com/acmeair/acmeair
Merge branch 'aspyker/astyanax' into astyanax

Conflicts:
	.gitignore