Upgraded to Nikola 6
Merge pull request #1 from DBeath/nikola6

Upgraded to Nikola 6