Make fn + control do control + option
Merge branch 'master' of github.com:asmeurer/dotfiles

Conflicts:
	Library/Preferences/org.pqrs.KeyRemap4MacBook.plist