Rspec merge with master

Updated SOCM to use rspec and factory_girl_rails. GalaxiesController is spec'd out