tons of style updates-- and im sure a few conflicts
Merge branch 'master' of https://github.com/stevebosworth/beer_me