use thin as local development server (much much much faster)
if name is blank for a screen show a display_name instead
Merge branch 'master' of github.com:hodnettg/transitonrails