File renames, code cleanup, config vars now stored in array
Merge remote-tracking branch 'origin/master'

Conflicts:
	hosty.php
File renames, code cleanup, config vars now stored in array
File renames, code cleanup, config vars now stored in array
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore