Separate test and development gems

Primarily to avoid loading factory_girl in development mode because
it breaks the ability to setup a new database. However, this will
also speedup boot time in development mode by not loading gems which
are not needed.
Better errors for better feedback
Merge branch 'better_errors3' of https://github.com/ferrous26/Markus into ferrous26-better-errors

Conflicts:
	Gemfile