Merge pull request #40 from PCMDI/issue36_controlled_vocabulary

Issue36 controlled vocabulary
cleaned up build, now does not download data anymore, better cmake detection, removed pip string not used anymore
Merge branch 'issue_38_rm_sample_data' into devel