Re-define nil as nullptr, cleaning up some potential issues along the way
Merge pull request #270 from zrax/nullptr

Re-define nil as nullptr, cleaning up some potential issues along the way