Merge remote-tracking branch 'origin' into save_tag_info
add tilehierarchy object to encapsulate the notion of the tile set. need to add more accessors and use in combination with the graphtilereader
resolve merge conflicts
remove some items from gitignore that we no longer have
return empty result if filter = 1.  TODO check filter before populating the map.
added tags to stucts.
Merge remote-tracking branch 'origin/master' into save_tag_info

Conflicts:
	src/mjolnir/pbfgraphbuilder/pbfgraphbuilder.h
clean up.
conform to style guidlines a little better, sorry @duanegearhart
fixed merge issue.
conform to the style even more :(
Merge pull request #59 from mapzen/save_tag_info

Save tag info
fix merge conflicts
Merge pull request #58 from mapzen/kk_loki

add tilehierarchy structure
Initial unit tests for edgeinfobuilder
Merge branch 'master' of https://github.com/mapzen/valhalla into gdg

Conflicts:
	Makefile.am