Merge upstream yiistrap

As requested at #104
https://github.com/2amigos/yiiwheels/issues/104