Merge remote-tracking branch '/svn/SF-Flora-remote' into SF-flora-svn-trunk
version update
merge from the ergo branch
mostly doc/comments
minor
website and test updates
merged terminyzer's lost changes
merged the flora portion
Add initial directories