updated changelog
Merge branch 'master' of github.com:ralsina/nikola
Merge pull request #317 from okin/twitter_cards

Twitter Card support
merged master
Merge pull request #318 from okin/twitter_cards

Better parameter name.
Merge branch 'master' of https://github.com/ralsina/nikola into command_build_help
Updated changelog.