Merge pull request #1 from phenoscape/master

Example code.
Scala indenting fix.
Merge branch 'master' of github.com:balhoff/strix
Changed project name.
Merge pull request #2 from balhoff/master

Changed project name.