Updated README; Updated velocity templates to include semantic annotations renaming that Markus did
Merge branch 'version_2_with_components' of github.com:openplanets/scape-toolwrapper into version_2_with_components