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

Conflicts:
	.gitignore
config.json defaults now to the test instance
Merge pull request #1 from cristiroma/master

Added Jenkins config.json