Added build configuration for shamrock.
Edited index pages.
Deleted CNAME.
Bumped version.
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	component.json
	package.json
spruce: fix modal background-color and color
maxcdn sponsorship on united page
fix url to maxcdn
carbon costume sponsorship on amelia
carbon costume sponsorship tweaks
amelia: lighten border on responsive subnav
all: fix smoothscroll in safari6 with jquery plugin
initial commi for composer.json
Added bootstrap requirement and branch-alias
removed the alias
fixed license name, and removed cake-plugin for twitter npm provides what we need
Merge pull request #88 from electblake/gh-pages

Added Composer.json
updated swatchmaker readme, closes #89
remove shamrock
added core admin wrapbootstrap template
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	shamrock/index.html