Merge pull request #14 from Serializer/Refactor

PerkStore and JsonConfigHandler Refactoring:
Progress update
Merge branch 'Refactor' of https://github.com/disconsented/ANSSRPG into Refactor

Conflicts:
	.travis
Progress Update
Merge pull request #1 from disconsented/Refactor

Refactor