refactor

Also added .rspec and Guardfiles