Ignore local aliases file
Merge branch 'master' of https://github.com/eaudeweb/drupal-boilerplate

Conflicts:
	.gitignore