Merge pull request #181 from 5150Joker/dev

Revert handcuffs - we can look at this later or just use civ zip ties.