Merge pull request #17 from osuosl/master

Master
Merge branch 'develop' of github.com:osuosl/osuosl-drupal7 into develop
CSS files: Committing all changes so that site is up to date
Merge pull request #18 from osuosl/develop

Bring master back to where it was.