Options broken out into a gem
!
Merge branch 'master' of github.com:onthebeach/id