rails dev do the database thing a different way
add git url aliases
Merge branch 'master' into ccap