moving some stuff around getting ready for multiple environments
fixed bug with templates and thumbnails