Applying text wipes out images.

Fixes #164
Merge pull request #332 from theodi/bugfix-form-display

Applying text wipes out images.
Use named argument as implicit argument is deprecated
Use file storage for testing

Stop storing test files in rackspace
Do display none in css
Use aria-labelledby attribute correctly
Test badge svg
extract from application to badge controller
Download badge images as pngs
Popup to download badge images as pngs
Merge pull request #331 from theodi/feature-print-assets-for-members

Download badge images for members
Don't commit test images left around

Ideally we would find a way to delete these at the end of the test run
Move config/database.yml to being untracked

Use example file for travis tests by copying it in before running suite
Source cc logo from assets

Don’t load logo off p2p github.io site.
Make all generated urls use https
Merge pull request #334 from theodi/feature-all-ssl-all-the-time

HTTPS fixes.
Revert "Make all generated urls use https"

Hack doesn't work, It doesn't make the url generation for omniauth use
https.

This reverts commit 879fc144f738812e71cf20eda0d1fc96f85eed12.
Merge branch 'master' into feature-add-individual-member

Conflicts:
	.gitignore
	app/views/members/edit.html.erb