First gh-pages commit
Merge remote-tracking branch 'andy/gh-pages' into gh-pages

Conflicts:
	index.html
rename cosm to xively
Update documentation after make html