Merge branch 'feature/migrating_popgen' into develop

Author: karthikcharan83

.gitignore

@@ -3,15 +3,15 @@
 language: python
 
 python:
-  - "3.3"
   - "2.7"
-  - "2.6"
-  - "pypy"
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install: 
-  - pip install -r requirements.txt
+install:
+  - travis_wait pip install -r requirements.txt
 
 # command to run tests, e.g. python setup.py test
 script:
-  - py.test
+  - py.test
+
+before_install:
+  - sudo apt-get install liblapack-dev gfortran

.travis.yml

@@ -1,20 +1,13 @@
-The MIT License (MIT)
+Copyright 2015 FOSS-Transportation Modeling Initiative
 
-Copyright (c) 2014 Karthik Konduri
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

AUTHORS.rst

@@ -1,12 +1,12 @@
 =============================
-Synthetic Population Generator .20
+Synthetic Population Generator 2.0
 =============================
 
 .. image:: https://badge.fury.io/py/popgen.png
     :target: http://badge.fury.io/py/popgen
 
-.. image:: https://travis-ci.org/karthikcharan83/popgen.png?branch=master
-    :target: https://travis-ci.org/karthikcharan83/popgen
+.. image:: https://travis-ci.org/foss-transportationmodeling/popgen.png?branch=master
+    :target: https://travis-ci.org/foss-transportationmodeling/popgen
 
 .. image:: https://pypip.in/d/popgen/badge.png
     :target: https://pypi.python.org/pypi/popgen