add skype
Merge branch 'master' into work

Conflicts:
	chocolatey.config
Merge branch 'master' into home

Conflicts:
	chocolatey.config
del avastfreeantivirus
add microsoftsecurityessentials
add wtw
add hipchat
Merge branch 'home' into full

Conflicts:
	chocolatey.config
del microsoftsecurityessentials
Merge branch 'work' into full

Conflicts:
	chocolatey.config