Merge pull request #26 from NickGeek/development

Bug fixes
Merge pull request #27 from NickGeek/development

AJAXy stuff
Merge branch 'master' of https://github.com/NickGeek/campfyre into development
Fixing stuff from transition