Merge pull request #3 from softlayer/develop

[INTERNAL] Update contribution guidelines to reflect use of git-flow bra...
Merge pull request #5 from softlayer/develop

Add additional details to upgrade information
Merge branch 'develop'
Merge branch 'develop'