Merge branch 'develop' into releases
Merge branch 'develop' into releases
Merge branch 'develop' into releases
Merge branch 'master' into releases
Merge branch 'develop' into releases
minor code format changes
Merge remote-tracking branch 'upstream/develop' into develop
document vmdas support

Code written by Clark Richards
teos manpage: change filename
make ctdTrim() work in R 3.0

Possible bug fix for issue 316
ctd changes
Merge branch 'develop'
clarify ctd structure
improve gitignore
Merge branch 'develop'
R 3.0 ctd
Merge branch 'develop'
improve for R 3.0
Merge branch 'master' into develop
prepare for new version on 'develop' branch