Merge pull request #159 from ocefpaf/changelog

Changelog

Author: themiurgo

.travis.yml

@@ -11,13 +11,11 @@ before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
-    - hash -r
-    - conda config --set always_yes yes
     - conda update --yes conda
-    - conda info -a
-    - travis_retry conda create -n test $CONDA pip jinja2 pandas mock six nose
+    - travis_retry conda create --yes -n test $CONDA pip jinja2 pandas mock six nose
     - source activate test
     - travis_retry pip install vincent
+
 install:
     - python setup.py install
 

CHANGES.txt

@@ -1,12 +1,15 @@
-0.1.5
+0.2.0
 ~~~~~
-- Popups on lines. (themiurgo)
-- `fit_bounds` method. (themiurgo)
+- Popups on lines. (themiurgo 97c0a02)
+- `fit_bounds` method. (themiurgo 713c292)
 - GeoJSON popup. (ocefpaf 7aad5e0)
 - Added cartodb positron and dark_matter tiles (ocefpaf d4daee7)
 - Forcing HTTPS when available. (ocefpaf c69ac89)
 - Added Stamen Watercolor tiles. (ocefpaf 8c1f837)
-- Added Image Overlay. (andrewgiessel ---)
+- Added Image Overlay. (andrewgiessel b625613)
+
+Bug Fixes
+- popup width keyword is now consistent in all pop objects (ocefpaf e2c0310)
 
 Bug Fixes