Removed unused boost libs; rewrote the variable parsing system to fix a lot of bugs that were occurring under certain conditions
Merging files