Herokuassetstest

@matthewhuff89 ran rebase against development prior