fix various things
Merge pull request #81 from cordoval/81-pr-of-the-night

PR of the night
Merge pull request #82 from aequasi/master

This PR was merged into bldr-io:master branch.

Discussion
----------

Updating Dependencies

                   
|Q            |A  |
|---          |---|
|Bug Fix?     |n  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |n  |
|Fixed Tickets|   |
|License      |MIT|
|Doc PR       |   |
                   



Commits
-------

fdc933f258b8404528e1f1bb74a380b0e276e704 Updating Dependencies aequasi
Merge pull request #84 from aequasi/master

This PR was merged into bldr-io:master branch.

Discussion
----------

Updating Dependencies"

                   
|Q            |A  |
|---          |---|
|Bug Fix?     |n  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |n  |
|Fixed Tickets|   |
|License      |MIT|
|Doc PR       |   |
                   



Commits
-------

47641dc6c685a46b89359e926f32525ced5078c0 Updating Dependencies aequasi
Fixing conflict