Merge pull request #189 from chuckdumont/master

Updates to allow aggregator to host non-aggregated app resources.
Merge remote-tracking branch 'jaggr/master'