Review udpates (final proofing)
Removed proxy borrower directory from the master branch

The proxy borrower app isn't quite ready for primetime; I'm moving it
to the dev branch until it's ready.
Special collections and htaccess
Merge branch 'master' of github.com:ssu-library/library.working.dev
Merge branch 'dev' into staging
Merge branch 'staging'
.htaccess edits
Revert ".htaccess edits"

This reverts commit 0b452cc200e5a35322e566483e84041182e5168f.
Merge branch 'dev' into staging
Merge branch 'staging'
Enabled Google Analytics; added a lang attribute
Changes to Felicia's profile
Added the expandable research guides
Merge branch 'research_guides' into dev

Conflicts:
	research/guides/index.php