resolved conflicts in merging to master

Author: klehman-rally

VERSIONS

@@ -0,0 +1,55 @@
+0.8.7  - Dec 23, 2011
+    First public release (alpha)
+
+0.8.8  - Jan 2012
+    introduced warn=boolean to Rally instantiation
+    removed inflate=boolean in Rally instantiation
+
+0.8.9  - Jan 2012
+    putative fix for proxy support
+
+0.8.10 - Feb 2012
+    better fix for proxy support
+
+0.8.11 - Mar 24, 2012 
+    better support for default workspace/project when user profile doesn't specify
+       a default
+    fixed assignment of ref value in _createShellArtifact (_ref no longer has the .js on end...)
+
+0.8.12 - Mar 26, 2012
+    fixed fatal premature exercise of iterator on response in context check, defer to _getDefaults
+
+0.9.1 - July 9, 2012
+    Upped default WSAPI version in config.py to 1.30
+    All entities that are subclasses of WorkspaceDomainObject now have a details method
+    that show the attribute values in an easy to read multiline format.
+    Dropped attempted discrimination of server value to determine if it is a name or an IPv4 address    No longer look for http_proxy in environment, only https_proxy.
+    Introduced convenience methods dealing with attachments
+
+0.9.2 - October 1, 2012 
+    Fixed getProject method to take an optional name parm.
+    Added HTTP header item in config.py to set Content-Type to 'application/json'
+    Added keyword arg to restapi.Rally __init__ method to
+    allow specifying a verify_ssl_cert=True/False value to requests.session creation,
+      This results is passing on the the requests.session call a verify flag that it
+      uses to determine whether or not checking the SSL certificate is desired.
+      Modified the details method in entity.py to be more resilient by bypassing 
+      attributes that an item might have but doesn't have as a query fetch spec 
+      didn't include all potential attributes.
+    Fixed addAttachment to specify Attachment size as size of original attachment file
+    rather than the size of the base64 encoding result.
+
+0.9.3 - October 7, 2012
+    Fixed Pinger class to use correct ping options on Linux and Windows platforms.
+    Updated exception catching and raising to use Python 2.6/2.7 compliant syntax.
+
+0.9.4 - October 2013
+    Upped default WSAPI version to 1.43.
+    Tested against requests 2.0.0 which now support https via proxy.
+    Updated pyral.restapi.Rally to accommodate requests versions 0.x, 1.x and 2.x.
+    Fixed construction of multi-condition queries and broke out query construction into a separate code file.
+    Support for Rally dyna-types (PortfolioItem/<subtype> where subtype is one of Theme, Initiative or Feature.
+    Added UserIterationCapacity, Fixed the *CumulativeFlowData entity names.
+    Added internal facility to accept Rally reference identifiers in a list form and convert them
+    to a list of dicts with each dict containing a key-value pair for '_ref' and associated value.
+    Added a details method for any WorkspaceDomain derived entity instance.