Merge pull request #119 from clintbellanger/master

merge from master
Merge pull request #122 from clintbellanger/master

merge from master
Handle multiple occurrences of requires_power
Merge pull request #802 from RyanDansie/multiple_requires_power

Handle multiple occurrences of requires_power