Merge branch 'develop'

Merge branch 'develop'

Merge branch 'develop'

Merge branch 'develop'

Version bump, misc fixes (#6)

* Add Wikipedia reference

* Add new switches

* Remove troublesome words

* Version bump

* Update README

* Add tests for new switches

* Update copyright in license

* Make it sort of work (test will break) in Ubuntu

* Add some names mentioned in Snowden's documents

* Added Vault 7 (https://wikileaks.org/ciav7p1/cms/index.html) names

* Bump version

Develop (#4)

* Add Wikipedia reference

* Add new switches

* Remove troublesome words

* Version bump

* Update README

* Add tests for new switches

* Update copyright in license

* Make it sort of work (test will break) in Ubuntu

Add new swtiches (#3)

* Add Wikipedia reference

* Add new switches

* Remove troublesome words

* Version bump

* Update README

* Add tests for new switches

Merge branch 'develop'

Bump version

Aim was a little bit off