remove url from overrides to make them less strict. added version file
forgot to require version
fix merge conflict
t push origin 2-1-stable
Merge branch '2-2-stable' into 2-1-stable
Merge pull request #2 from joshblour/2-1-stable

2 1 stable