Fixed bug with pickups not being updated, reformmated a bit, added mixin example
Merge branch 'master' of https://github.com/rnewton/emma

merge from github