Merge branch 'release/v1.1.0'
made it so only member_group_conditionals are run more than once (in embeds)
Correct a spelling error in README
Merge pull request #15 from alexroper/develop

Correct a spelling error in README
fix for archive conditionals when using freebie
Adding {insecure_site_url}.
Merge pull request #17 from eedfw/master

Adding {insecure_site_url}.
Preventing odd scenario where site_url might already be https (or vice versa).
PHP spec just calls for HTTPS to not be set, not specifically off. This return wrong results in my nginx install personally. See http://php.net/manual/en/reserved.variables.server.php
Fixing my stupid tabs. I blame git.
made pagination_base_url freebie compatible
added pagination_base_uri var, fixed archive conditionals to work when pagination is detected
Merge pull request #18 from eedfw/master

Fixes pertaining to secure function.
Merge branch 'master' into develop
add {if categorized} and {reserved_category_word}

manually merge #23 (thanks @timkelty)
bump version number to v1.1.1, update change log
Merge branch 'release/v1.1.1'
Merge branch 'release/v1.1.1' into develop
typos/changes in readme
Merge branch 'master' into develop