special offer changes + contact chagne

Signed-off-by: Chris Jones <chris@jonezy.org>
another big batch of changes

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #166 from jonezy/master

many small updates and fixes.