Firs p done
Merge branch 'master' of https://github.com/vertica-as/Rapunzel

Conflicts:
	Rapunzel_D.txt
merge shizzle
Merge branch 'master' of https://github.com/vertica-as/Rapunzel
Merge branch 'master' of https://github.com/vertica-as/Rapunzel
Merge branch 'master' of https://github.com/vertica-as/Rapunzel