Fund type with data

This pull request adds @millerEric's changes to the process code, as well as fixes merge conflicts with the two differing api datasets. 

Visualizing Fund Type
----
Since this merge adds `fund_type` to the model, here are two potential ways to visualize the data on the map.

![Different Color](https://cloud.githubusercontent.com/assets/719357/4289496/40291bda-3db4-11e4-9962-eab80aca7525.png)
This shows the countries that are locally funded in a different color. This means that fund_type is a type of label for two different sets of countries.

---
![Different Opacity](https://cloud.githubusercontent.com/assets/719357/4289510/5cec13a8-3db4-11e4-9a07-47a4308841b6.png)
This shows the countries that are locally funded in a different opacity. The rationale is that it would de-emphasize their contribution to UNDP projects in other countries.

---
Both maps need additional legend to explain the color change, but what do you think is the right context to interpret `fund_type`?
 
cc @dereklieu @jueyang @smit1678