updated bib
Merge branch 'gh-pages' of github.com:maigner/www into gh-pages

Conflicts:
	maigner-pub.html
	maigner.bib
	maigner_bib.html