Code review fixes rb

Addresses some issues noted in [Nov 25th's code review](https://github.com/cremalab/engagement-ring/wiki/November-25,-2013-Code-Review-Notes)

Still room for improvement, but a lot of cleanup.

* [x] :thumbsup:  @matao