wat
Terminal changes to make OS X happy
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules

(I accidentally deleted my folder somehow and it got synced through Dropbox, so
I had to restore it from Backup and merge it with upstream. Ugh.)