Merge pull request #1 from zstayman/master

underscore and backbone added
Merge pull request #2 from zstayman/master

fixed databasing
Merge pull request #3 from zstayman/master

pry
pulling
fixing merge conflicts
merge
fixed merge conflict
set up basic routes/view
Merge pull request #4 from iliastsangaris/basicpage

Basicpage
adding Esri map
sectors uploaded
ESRI map centered on US
fixed merge conflicts
fixed Tai merges
Merge branch 'map'