Merge branch '2.0.0a' of github.com:crockett95/uncorked-wp-theme

Signed-off-by: Stephen Crockett <crockett95@gmail.com>

Conflicts:
	codekit-config.json
Merge branch '2.0.0a' of github.com:crockett95/uncorked-wp-theme into 2.0.0a

Signed-off-by: Stephen Crockett <crockett95@gmail.com>

Conflicts:
	codekit-config.json.orig