Fixed commit merge conflict.
Merge pull request #31 from toonketels/footer

Fixed commit merge conflict.
fix page_url helper for ghost 0.5
Merge pull request #37 from epistrephein/master

fix page_url helper for ghost 0.5
Merge remote-tracking branch 'original/master'
Merge remote-tracking branch 'original/1.4'