renaming, reorg of code
Merge branch 'master' of github.com:stevedowney/ucb_rails