Fixes.
Added headbutting for permalinks.
Fixed merge conflict.
Updates.
Merged from upstream, fixed conflicts.
Added blurb for Intel.
Added POKKT as a sponsor.
Merge pull request #33 from rudimk/droidcon2014

Fixes + content updates.