Merge pull request #27 from Tradeshift/master

Don't collect function keys from the spirit itself
Merge pull request #28 from Tradeshift/master

Fixes
Merge pull request #29 from Tradeshift/master

Accept this pull request, or else...
Formatting

This changes everything
Merge pull request #30 from wiredearp/master

Formatting