Sync CONTRIBUTING.md with sassdoc.com/contributing

Author: pascalduez

CONTRIBUTING.md

@@ -15,23 +15,25 @@ Please, do not open an issue only to ask a question; it is not the best place fo
 
 If it's not, you can leave your question on:
 
-* [tlk.io/sassdoc](http://tlk.io/sassdoc)
+* [SassDoc on Slack](http://sassdoc.slack.com/)
 * [#sassdoc on freenode](http://webchat.freenode.net/)
 
-If you need a quick reply or don't feel really comfortable with asking on a public channel, try getting in touch with us on Twitter: [@SassDoc_](https://twitter.com/sassdoc_).
+If you need a quick reply or don't feel really comfortable with asking on a public channel, try getting in touch with us on Twitter: [@SassDoc_](https://twitter.com/sassdoc_), the official account.
 
 ## Filling a bug
 
 So you think you've found a bug? Likely. We're all humans after all! Before even opening an issue, you have to know how SassDoc is architected so you can submit an issue in the accurate repository:
 
 * [Core](https://github.com/sassdoc/sassdoc): API (you're here)
-* [Theme](https://github.com/sassdoc/sassdoc-theme-light): Theme, templates and styles
+* [Theme](https://github.com/sassdoc/sassdoc-theme-default): Theme, templates and styles
 * [Extras](https://github.com/sassdoc/sassdoc-extras): Extra tools for theme authors
 * [Grunt plugin](https://github.com/sassdoc/grunt-sassdoc): Grunt integration
 * [Gulp plugin](https://github.com/sassdoc/gulp-sassdoc): Gulp integration
 * [Broccoli plugin](https://github.com/sassdoc/broccoli-sassdoc): Broccoli integration
-* [Theme generator](https://github.com/sassdoc/generator-theme-sassdoc): Yeoman theme generator
-* [Site](https://github.com/SassDoc/sassdoc.github.io): SassDoc's site
+* [Yeoman Theme generator](https://github.com/sassdoc/generator-theme-sassdoc): Theme generator
+* [Site](https://github.com/sassdoc/sassdoc.github.io): SassDoc's site
+* [Syntax converter](https://github.com/sassdoc/sass-convert): Sass to SCSS converter and the like
+* [Blank theme](https://github.com/sassdoc/sassdoc-theme-blank): Blank theme
 
 Please give GitHub's search a try first, to make sure someone didn't already submit something similar. If what you've found seems unique, be sure to open an issue in the appropriate repository with a clear title and a description as complete as possible.
 
@@ -48,8 +50,8 @@ Want to contribute? Awesome!
 
 If it's a little something like typo, styles or wording, feel free to jump on it and submit a pull request; chances are high it will be quickly merged.
 
-If you are thinking of something a bit more complex, be sure to talk with someone from the team before even starting coding in order to avoid any useless work.
+If you are thinking of something a bit more complex, be sure to talk with someone from the team before even starting coding in order to avoid any useless work. Also be sure to read our [code guidelines](GUIDELINES.md).
 
-New features or sizeable refactors should be based on the `develop` branch.
+New features or sizeable refactors should be based on the `develop` branch while bugfixes should head into both `master` and `develop`.
 
 Anyway, thank you very much for contributing!