Revert "Refactored spec a bit, still trying to get around errors on rvm 1.8.7"

This reverts commit 4eb7b44d75d0c440a78702226ee1f19b672ea83e.
Revert "Tweaked formatting to attempt to fix syntax errors for rvm 1.8.7"

This reverts commit e4f3464667d6d58b6e40b565b61592d7050ddc2c.