More cleanup
Final cleanup
Merge branch 'master' of github.com:bellycard/rolodex

Conflicts:
	lib/rolodex.rb
	rolodex.gemspec
Merge pull request #60 from shayhowe/master

Cleanup