Updated Nikola.  5 months worth of changes packed in.

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>