Merge branch 'SU-2' (consolidated files, adapted to new aermod setup).