Bug fix related to bare metal server ordering
Update the unit tests for the new hardware order templates

Fixes #55
Fix the poorly handled 2.2.1 version
Merge the 2.2.2 changes into the 3.0 branch

Conflicts:
	CHANGELOG.textile
	lib/softlayer/VirtualServer.rb
	lib/softlayer/base.rb
Pull remote changes into the local branch to complete merging 2.2.2 into 3.0 branch