simplified logic on skill calculation in the CharacterSkill model in models.py

Also, forgot to mention on last commit, updated models.py
added proper defaults for fields and finished filling out lookup fields