Major refactor for cleanliness sake and preparing for documentation
Re-add force as a default, it really is required.

Damn you Jekyll.