Minor updates. Mainly just pushing to keep up to date
Merge branch 'master' of https://github.com/thornycrackers/fbnr-new