Small updates.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	css/custom.css
Remove unnecessary IDs.
Merge pull request #5 from Kashomon/master

Small cleanups before CSS refactor