Updating pom
Adjustment to template delete method
Prevent terminate from trying to stop non running servers
Merge branch '2013.07' into develop
Merge branch 'develop' of git://github.com/andylyall/dasein-cloud-vsphere into andylyall-develop
Merge branch 'develop' of https://github.com/greese/dasein-cloud-vsphere into develop