clean up the stylesheets and layouts

make it look like the production (there are a few small differences now
but overall I think it looks as good or better as production now)

merge everything into one stylesheet and layout.  it was getting hard to
keep track of which stylesheet/layout was being used
add button style
Merge remote branch 'origin/fe' into fe
move the jquery require into application