Merged changes from 2013.02

Merged changes from 2013.02
Merge branch 'develop' of https://github.com/greese/dasein-cloud-opsource into develop

Conflicts:
	src/main/java/org/dasein/cloud/opsource/compute/VirtualMachines.java
	src/main/java/org/dasein/cloud/opsource/network/IpAddressImplement.java
	src/main/java/org/dasein/cloud/opsource/network/SecurityGroup.java