Merge pull request #11 from dlindahl/master

Support ERB in database.yml files
Remove ruby- prefix