Re-enable menu bar
Set column line at 100
Revert "Re-enable menu bar"

This reverts commit c4e61fb5988323ab58aadcadd0e8c7b668f61106.

Conflicts:
	config/editor.el
Fix typo in whitespace-style
Use solarized theme
Remove smartparens
Add helm-mode
Revert "Add helm-mode"

This reverts commit fd81dce319942ebd490c8062ce845dde068ad696.
Update gitignore
Enable evil
Differentiate between style based on hostname