Merge branch 'kyle'
Fixed notify_comment
Split up files into discrete sections, hopefully this will make merging a tad easier.
Split up files into discrete sections, hopefully this will make merging a tad easier.
Merge branch 'dylan' into kyle