wip
Merge branch 'master' into MacOSX
mac wip
wip conditionals
wip
remove tabs from Makefile.am
wip - problem with some links
wip
compiles on linux
Merge branch 'master' into MacOSX
Merge branch 'master' into MacOSX
wip
wip
wip
wip
wip
Client compiles on Mac. Needs all dep libraries to use libc++ and gnu++11
linux compat too