Make changes for 0.14
Merge branch '0.14'
Fix naming issue
update readme for 0.14
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore