Fuel Graph Merge -- NOTE: Possible outdated schema

Merged the fuel_graph branch with darkmoves:master. Resolved merge conflicts and integrated fuel_graph code with existing app. Working locally. Pull request to merge with DannyCrews:master. 

NOTE: My DB schema differs significantly with the DannyCrews:master version. I made no changes so it's likely that I pulled an earlier version. My changes are likely the ones that should be discarded.