Some fixes to get compilation and uberjar working
Merge pull request #1 from weissjeffm/master

Thanks!