- move Capistrano configurations to examples
- Git ignore any deployment specific capistrano files
- Make README use Markdown
- Add extra steps to rename the Capfile and config/deploy.rb from their example files.
- Use nicer looking code blocks (4 spaces vs backticks)
- Ignore deployment specific ruby management files
Merge branch 'remove_deployment_specific_items' of github.com:treydock/collex
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
- More explicit ignores of possible deploy script folders
Merge branch 'master' into remove_deployment_specific_items
Update 404.html

Changed to reflect MESA verbage, tab order, and analytics block.
Merge branch 'patch-1' of github.com:MedievalMatt/collex into MedievalMatt-patch-1
Merge remote-tracking branch 'upstream/master'
remove the typewright walkthrough video link
Fix wrong variable being referenced to get current user's username
- Update the contact email addresses for federation skins to use working email addresses
-- Idea for spam protection came from http://parsons.me/2012/12/spam-proof-mailto-email-address
Merge pull request #2 from treydock/merge_upstream

Merge upstream