Merge pull request #59 from brendam/master

fix calendar links in membership page
fix formatting of address
remove blockquote
fix for issue #61, ignore Gemfile.lock, I am still too much of a noob to be able to work out how the heck to ignore files in git

Reverted back to base because I didn't mean to change Gemfile.lock
- Deleted Gemfile.lock, it shouldn't be there
- Added Gemfile.lock to the .gitignore file to make sure it stays dead
Merge pull request #62 from mbainrot/master

Added favicon.ico, add .lock file to .gitignore (fixes #61)