Ignored nodenv local version setting
Removed trailing comma from bower.json
Fixed issue in browser where jquery was missing from example
Fixed package.json for conference talk
Merge branch 'pr/1'

Conflicts:
	bower.json
	package.json