Fix newline after colon inside a list
Merge pull request #693 from toctan/fix-python-electric-rule

Fix python electric layout newline
[Fix #692] Don't set the default css indent in the css-mode-hook
Merge branch 'master' of github.com:bbatsov/prelude
Don't set scss-compile-at-save in the mode hook
add org autocomplete
Merge branch 'master' of https://github.com/martin-liu/prelude

Conflicts:
	personal/init-martin.el
Merge branch 'master' of https://github.com/bbatsov/prelude
Remove redundant feature check
Rename prelude-ido-goto-symbol to prelude-goto-symbol
Merge branch 'master' of https://github.com/bbatsov/prelude