merged changes from upstream/ui-improvements 8c3e92f

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
[ci skip]
minor tweak to Gruntfile [deploy]

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
trying replaceWith again for splash [deploy]

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
added a Procfile to enable deploying to heroku

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
[ci skip]
trying to get the heroku deploy to work again [deploy]

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>