fixes issues since update to docpad 6.45
fixes issues since update to docpad 6.45
Docpad upgrade
changes for package.json
merge conflict
updated twitter url and next last page icon
Merge pull request #1 from mgroves84/develop

Merge from Develop