Merged xjzhang/remoteadv into master
Merge branch 'master' of bitbucket.org:ntpeters/remoteadv
Merge branch 'master' of github.com:ntpeters/remoteAdv
Switching over to using the repo for SimpleLogger to more easily keep it up to date