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

Fixing add/remove associated commands
Merge remote-tracking branch 'upstream/master' into cv-master
Merge pull request #55 from daviddavis/cv-master

Merging master into content-views
wat