- move capistrano deployment files to examples
- Update README to use Markdown
- Add extra steps for deployment to rename the example files
- Ignore deployment specific ruby management files
Merge branch 'master' of git://github.com/collex/catalog
More explicit ignores of possible deploy script folders
- retab using VIM
- Return after rendering error to prevent multiple calls of render or redirect methods
- Return after rendering error to prevent multiple calls of render or redirect methods.  Fixes #1
Merge branch 'fix_multiple_render_redirect_errors'
Merge remote-tracking branch 'upstream/master'
- Add 3 new configuration options to site.yml to override where tasks store files and how they are sent
-- Defaults are found in config/site.example.yml and reflect previous hardcoded values
- Define methods in the solr rake tasks to utilize new configuration options
Revert "- Add 3 new configuration options to site.yml to override where tasks store files and how they are sent"

This reverts commit cfd8817afe830aa54099dfbade72996c23b7c6af.
Revert "- Return after rendering error to prevent multiple calls of render or redirect methods.  Fixes #1"

This reverts commit f10936eaccb7ea9fd23a68fa8e942dd3593f170a.
Revert "- retab using VIM"

This reverts commit f3a19a79dbe3c6f103856c9b85fca602eb74a69e.
- Add 3 new configuration options to site.yml to override where tasks store files and how they are sent
-- Defaults are found in config/site.example.yml and reflect previous hardcoded values
- Use Settingslogic to make site.yml values accessible in code base.
Merge branch 'configurable_rake_tasks'
Merge pull request #1 from treydock/merge_upstream

Merge upstream