Preliminary fixes to make linux compiling 'just work'
Merge pull request #1 from klavinslab/linux_compile

Preliminary fixes to make linux compiling 'just work'