Build somewhat less broken
Merge branch 'master' of github.com:cactorium/George
More changes in code, getting closer to a build