Updating the branch to be in line with Master. This included adding Neat.