Allow template override of no-conflict file
Only include recpatcha if turned on
Cleanup filesystem useage
Use quoteName on db queries
Remove unneeded tab
Merge pull request #102 from wilsonge/development

Code Cleanup