Merge pull request #45 from wesbos/master

Rearranged routes
Merge pull request #46 from wesbos/master

Improved settings flow
Making some changes to how some of the git operations work
Had the params wrong for a PR
Latest updates