Merge pull request #8 from INN/gh-pages

Merging gh-pages back into webapp-dev
GitHub buttons, uses http for link to webapp from readme
oops
Removes leftovers from merge
Merge branch 'webapp-dev' into gh-pages

Conflicts:
	index.html