[glesys] Attributes were overwritten when getting server details

Attributes were overwritten when requesting full information about a
server. Essential the problem is that both the server details and the
server status were requested from Glesys then merged together to create
a Fog Glesys server model object. I moved some of the status attributes
into a usage attribute on the server instead.
Merge pull request #1552 from smgt/glesys-server-attribute-fix

[glesys] Attributes were overwritten when getting server details
[glesys] Fix bug when trying to attach a ip to a server
Merge pull request #1553 from smgt/glesys-fix-ips-bug

[glesys] Fix bug when trying to attach a ip to a server
[glesys] Platform methods to templates
[glesys] Rename template model to match Fog convention
[glesys] Remove unused features from template model
Merge pull request #1554 from smgt/glesys-add-platform-to-templates

[glesys] add platform to templates
[rackspace|storage] fixed issue in ruby 1.8.7 where metadata was not being deleted when set to nil
Merge pull request #1556 from rackspace/storage_tests

[rackspace|storage] fixed issue in ruby 1.8.7 where metadata was not being deleted
Remove existing (unused) parser module and introduce a
TerremarkParser - which extends the base parser with the ability to
extract relevant attributes
Use the TerremarkParser to extract relevant attributes
Minor Fix to delete the internet service
Merge branch 'master' of git://github.com/fog/fog into terremark_fixes
Merge branch 'master' of git://github.com/fog/fog into terremark_xml_parser_fixes
Merge pull request #1557 from chirag-jog/terremark_xml_parser_fixes

Terremark xml parser fixes - issue #1549
Merge pull request #1558 from chirag-jog/terremark_fixes

Minor fixes to Terremark
Enable ebs-optimized spot instance requests
test spot instance request parser
Merge pull request #1560 from boz/ebs-optimized

Enable ebs-optimized spot instance requests