Version 2.0.0
Merge branch 'development'

Signed-off-by: TJ Eastmond <tjeastmond@spin.com>

Conflicts:
	.gitignore
	readme.markdown
	underpub.js
	underpub.min.js