rspec setup
install rspec

* rspec:
  rspec setup
location city dropdown
location variable cleanup
rename units to floorplans
manhattan and stillwater search pages
location specific search page
more rspec set p
manhattan/stillwater header images
load ksu header on manhattan search page
updated welcome page icons
i dont know
master search page work

* master-search:
  updated welcome page icons
  load ksu header on manhattan search page
  manhattan/stillwater header images
  more rspec set p
  location specific search page
  manhattan and stillwater search pages
  rename units to floorplans
  location variable cleanup
  location city dropdown

Conflicts: