use consolidate to make template engine configurable
#326 merge latest
#236 implement swig instead of jade
#236 fix travis asking for user input
#236 add .idea to gitignore
Merge pull request #236 from fyockm/master

use consolidate to make template engine configurable
Fixed consolidate dying on behalf of a cache=true, it needs to be cahce=memory
Initial commit for the site
Revert "Initial commit for the site"

This reverts commit 4e37a3f2c748e5d2144675a92f15acc28ac8bdb2.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/includes/foot.jade
	app/views/includes/head.jade
	app/views/layouts/default.jade
	app/views/users/auth.jade
	package.json
	public/views/articles/view.html