Fix proper structure
Add support for function states

E.g. support for various library's observables.
Merge branch 'master' of github.com:Sirupsen/SteakMachine