Selective sources per OS.
Merge branch 'master' of http://github.org/ecrampton/meridian
Removing debugging.