Merge remote-tracking branch 'upstream/dev'
Merge remote-tracking branch 'upstream/dev'
Merge pull request #81 from ShadowSam/master

Cleaned up all references to username that are no longer needed due to t...
Merge remote-tracking branch 'upstream/dev'
Fixing issue with username.