Updated configuration structure and dependent code. Added Octopress module for easier sharing of helper methods.
Merge 2.1 with new-configs