Rebase from pyfa.org/master

# Conflicts:
#	eos/effects/boosterarmorhppenalty.py
#	eos/effects/boosterarmorrepairamountpenalty.py
#	eos/effects/boostercapacitorcapacitypenalty.py
#	eos/effects/boostermaxvelocitypenalty.py
#	eos/effects/boostermissileexplosioncloudpenaltyfixed.py
#	eos/effects/boostermissileexplosionvelocitypenalty.py
#	eos/effects/boostermissilevelocitypenalty.py
#	eos/effects/boostershieldcapacitypenalty.py
#	eos/effects/boosterturretfalloffpenalty.py
#	eos/effects/boosterturretoptimalrangepenalty.py
#	eos/effects/boosterturrettrackingpenalty.py
#	eos/saveddata/character.py
#	eos/saveddata/drone.py
#	eos/saveddata/fighter.py
#	eos/saveddata/mode.py
#	eos/saveddata/module.py

eos/saveddata/character.py

@@ -335,7 +335,8 @@ class Skill(HandledItem):
             return
 
         for effect in item.effects.itervalues():
-            if effect.runTime == runTime and effect.isType("passive") and \
+            if effect.runTime == runTime and \
+                    effect.isType("passive") and \
                     (not fit.isStructure or effect.isType("structure")) and \
                     effect.activeByDefault:
                 try: