Configuration based block overriding. Configuration cleaned up. Helper functions added.
Merge branch 'master' of github.com:magento-hackathon/Implement-Module-for-prediction.io
Remove line left after a conflict.