Remove the index file from the master branch.
Update the bower configuration to ignore some extra files.
Merge branch 'master' into gh-pages

Conflicts:
	index.html