Merge branch 'issue-21-list-addresses-by-network' of https://github.com/jrperritt/gophercloud into jrperritt-issue-21-list-addresses-by-network

Conflicts:
	.travis.yml