Merge branch 'master' into develop
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
Merge remote-tracking branch 'remotes/origin/develop' into develop
Merge branch 'master' into develop
Changed freenode link to IRC URI
added + to signify ssl in irc uri