Replace Master branch with contents of cybox2.0 branch

Going forward, the `master` branch will be used for development of the CybOX 2.0 API. It involved a bit of git-fu to get this working properly, without causing merge conflicts and confusion for anyone who had checked out the previous `master` branch (now the `cybox1.0` branch)