litmus config change
removal of litmus api Push
change litmus test method
change of litmus options
clean
update
Merge branch 'master' of github.com:nathanbuckley/HTMLEmailTestCLT

Conflicts:
	conf.json