c
Merge branch 'master' of https://github.com/purcell/emacs.d

Conflicts:
	init-spelling.el
c
Disable org-startup-indented, which clashes with auto-complete
Run check-parens in after-save-hook for lispy buffers
Enable more paredit keys in every prog mode
Enable auto-complete in ielm
Enable electric-pair mode if available (see #75)
Add simplistic function for byte-compiling an .el file in a subprocess
Include new separate init-paredit file
Only add ido buffer function in older emacsen

Virtual buffers are better when available!
support underscores in symbols when converting between ruby hash syntax versions
Merge pull request #78 from skaes/fix-ruby-hash-syntax-conversion

support underscores in symbols when converting between ruby hash syntax versions
Remove unnecessary comment
Enable auto-compile-on-load-mode
Extract code into separate ruby-hash-syntax package
Restore smex as the default function bound to M-x
Merge branch 'master' of github.com:JamesYuan/emacs.d
Merge branch 'master' of https://github.com/purcell/emacs.d
Remove duplicated paredit key bindings

Thanks for spotting this, @osener