Merge branch 'master' of github.com:Pylons/pyramid
Update documentation for include_ip

Add a note that using the include_ip functionality with IPv6 is not a
good idea due to the users network expiring IPv6 addresses quickly.

See preferred lifetime/valid lifetime for routers doing SLAAC in IPv6
for more information.
Add test for AuthTktCookieHelper for IPv6 compat

Add an extra test that sets environ['REMOTE_ADDR'] to an IPv6 address
"::1".
Add tests for AuthTicket/parse_ticket for IPv6 compat

Add some simple tests that test IPv6 compatibility with the AuthTicket
class and the parse_ticket function.
Fix IPv6 compatibility in calculate_digest()

This is a quick fix for adding IPv6 compatibility so that if the
AuthTktAuthenticationPolicy is used with include_ip enabled then it
won't throw an error.
Sign CONTRIBUTORS.txt
grammar fixes
address issues raised by Tres Seaver at #884
Added an options argument to pyramid.paste.get_appsettings, just like get_app, that can be used to get the settings when interpolation is used in the config file.
Added support for config file variables to the scaffold script initializedb.
no need to re-install

This will continue working fine.
Merge branch 'master' of github.com:Pylons/pyramid
some improvements/fixes to a paragraph
Merge branch 'bugfix/ipv6_compat' of bertjwregeer/pyramid into fix.831
enhance the docstring on include_ip in auth tkt to explain compatability
update CHANGES.txt
Merge branch 'fix.831'
Merge branch 'master' of github.com:Pylons/pyramid
Merge pull request #925 from tshepang/patch-1

some improvements/fixes to a paragraph
Merge branch 'master' of madjar/pyramid into pull.911