Changed the data model drastically
Parser now reads in components of new data model
Created much cleaner parser
Changed some settings back to the way they were previously
Merge remote-tracking branch 'origin/master'