moved application.example.yml to applicatin.yml
merged upstream
finished merge w/ upstream/master
resolved merge conflict in _base.css
updated comment
fixed merge conflict in _base.css
merged in 5c3aa09, color variable consolidation
restored some color variation that was flattened out by the previous commit
moved button colors into named variables
moved checkbox colors into variables
pulled out color variables for sidebar filter buttons
more named colors in sidebar
pulled btn-utility colors out into variables
pulled search highlight color out into variable
renamed btn-whatever variables to button-whatever
moved pagination colors into variables
pulled highlights, alert colors, and main header colors into variables
pulling border and background colors into variables.
main h1 color moved to variable
fixed select for pagination "next" bg on hover