Fixed several bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/people/manifests/hackreactorworkstations/applications/sublime_text_2.pp