Merge pull request #43 from wesbos/master

Latest updates
I think I have settings working now

Cleaning up a bit in the tests, hopefully travis wil work now.
Fixing tests
Fixing Travis... I hope
Adding the upstream after clone
git commit flow