This commit brings in some minor JS fixes, and twitter API functionality.
Resolving conflicts.
Merge branch 'jordan' of github.com:jordankueh/wordpress-theme into jordan

Conflicts:
	functions.php
	header.php
	index.php