WIP: Refactor constants (comments welcome)

Update this to point at my binstar?