Added rdiscount as a dependency
Fixed adding of <current directory>/lib to LOAD_PATH
Turned Octopress::Configuration into a class
Added Hash#deep_merge
Added travis config