Merge pull request #194 from arista-eosplus/develop

Collapse develop back in to master in preparation for v1.1.0 release.
cleanup for 1.1
Merge pull request #198 from arista-eosplus/master

Master