Switched over to pyramid_tm and did PEP8 cleanup
Merge pull request #26 from sontek/switch_to_pyramid_tm

Switch to pyramid tm