changed
WIP: More tweeks for ubuntu support.

refs #75, #70, #49, #47