Learned about and applied elisp docstrings

E.g., "you should not indent the second line of a documentation string, if
it has one" [1] and "It is a good idea for most lines to be no wider than
60 characters" [2].

[1] http://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Basics.html
[2] http://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html#Documentation-Tips
Some python stuff
Merge branch 'master' of https://github.com/fasiha/.emacs.d

Conflicts:
	init.el