Fixing add/remove associated commands
Merge pull request #54 from daviddavis/temp/20140211151347

Fixing add/remove associated commands
Rubocop: Fixing failures
Merge pull request #58 from daviddavis/temp/20140214154118

Fixing rubocop failures