adds aliases in database.yml.sample
Merge pull request #82 from sl4m/database_yml

adds aliases in database.yml.sample
Merge remote-tracking branch 'upstream/master' into rails4

* upstream/master:
  adds aliases in database.yml.sample

Conflicts:
	test/database.yml.sample