move tests to nosetests in test dir
Don't print mismatched timestampes. They are not useful.
move tests to nosetests in test dir
removed unused templates
set max height and width of pics to 150px
don't ignore www/pub.d
Merge branch 'master' into testing

Reconcile branch with origin