Added tests
Had to remove window reloads

We should never reload a window in angular but use $location instead.
Using window reloads also breaks karma testing
Settings controller refactoring and added tests

Refactored settings controller methods to more accurately represent
purpose and added tests for setting controller methods
Merge remote-tracking branch 'origin/chris'