Fixed tiny merge conflicts
merged and fixed conflicts with default-packages
Merge branch 'uvcmetrics_devel_for_beta' into devel
Merge branch 'vcs_queries' into devel
Merge remote-tracking branch 'devel/update_uvcmetrics' into devel-master
Merge branch 'git-protocol-respect' into devel
Merge branch 'update_uvcmetrics' into devel
Merge branch 'uvcmetrics_more_sample_files' into devel
Merge remote-tracking branch 'devel/add_travis' into devel-master
Merge pull request #130 from UV-CDAT/add_travis

Add travis
Merge branch 'vcs_fix_boxf_test' into devel
Merge branch 'update_devel' into devel-master
Merge pull request #131 from UV-CDAT/add_travis

Build lean version on the travis
Merge branch 'vcsDV3D-uvcdat-integration' into devel
Merge pull request #132 from UV-CDAT/add_readme

Added README for UVCDAT
Merge pull request #133 from UV-CDAT/add_readme

Added missing tag for the travis
Merge remote-tracking branch 'origin/fix_travis_for_master' into devel-master
Merge remote-tracking branch 'devel/update_travis' into devel-master
Merge branch 'update_version_number' into devel
Merge branch 'cdutil_cleanup' into devel