Modified .gitignore
Fix a bug
Merge branch 'master' into appendix-test

Conflicts:
	.gitignore

	modified:   elpa/archives/gnu/archive-contents
	modified:   elpa/archives/marmalade/archive-contents
	modified:   elpa/archives/melpa/archive-contents
	modified:   elpa/f-20131025.2156/f-autoloads.el
	modified:   elpa/f-20131025.2156/f-pkg.elc
	new file:   elpa/f-20131025.2156/f.elc
	modified:   init.el
	modified:   inits/00-keybind.el
	new file:   inits/99-encoding.el