resolving conflicts
ALMOST compiles on OSX

* nuCell serializes using ints, not chars
* ugly premake hacks, look away
* unordered_map defined using std::tr1 instead of std::