cleaning up merge
Merge branch 'master' of github.com:KevDog/go-stormpath