Fix pivotal commenting and timestamps
Content-Type
Merge pull request #118 from gengo/fix_pivotal_comments

Fix pivotal commenting and timestamps
Redo a functions
Merge branch 'master' into etcd

Conflicts:
	goship.go
Update PivotalConfig test and merge master