merge branches and enhance with configurable view filtering#3

Open

tardate wants to merge 15 commits intostevo:masterfrom

evendis:merge_master

Commits on Oct 17, 2014

Allowed you to pre-process .sql files through erb
nathanpalmer
committed
Fixed the mis-naming of exc in the catch
nathanpalmer
committed
Rolling back the db transaction in the case of postgres where you cannot continue where you left off
nathanpalmer
committed

Commits on Nov 20, 2014

Added a single test to get the testing infrastructure setup
nathanpalmer
committed

Commits on Nov 23, 2014