merging changes
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com
Merge branch 'master' of https://github.com/evbogue/docpad.evbogue.com