Updated to ruby 2 and added stuff for zeus
Updating gems and locking shoulda-matchers

(It was breaking things)
Adding some specs and fixing one bug