Merge pull request #42 from austenlauria/master

Edited pcap_test.py to accomodate unit tests, added test_pcap.py to perform unit tests on pcap. Also packets are now happily sent to front end in a json object. Tests fail on Travis, but pass on my laptop. I'm guessing it won't wait to actually capture packets, or something.
Merge pull request #46 from austenlauria/master

cleaning up repo.
Commiting for merge
Merge remote-tracking branch 'upstream/master' into more_backbone
Backbone modules created, added route highlighting
A bajillion lines of code later../..
Merge pull request #47 from zysh/more_backbone

Switched our Javascript over to Backbone JS
small style changes for the nav bar and the map-overlay
Brings navbar back, adds background color to map-overlay and fix css errors
Merge pull request #48 from Sigf/master

small style changes
Reorganizes style sheet into a single file. Adds organization rules.
Reorganizes style sheet into a single file. Adds organization rules.
Merge pull request #49 from Sigf/master

style sheet organization
Changes the color of the badge to the color of the path. Adds city name to marker
Merge pull request #51 from Sigf/master

Markers and Badges
Removes old code
Adds info window for markers
Adds lat and lon formating
Adds default format for when no markers are clicked yet.
Merge pull request #57 from Sigf/master

Markers Info Window