initial setup
Merge branch 'master' of github.com:harvard-lil/linky
basic modal functionality
added draft post and get linky api
move web stuff into a web dir
added etc dir and example conf file
added gitignore (so that we don't accidently track our config file)
typoed gitignore file name. fixed.
was tracking non-example conf.
Merge branch 'develop' of github.com:harvard-lil/linky into develop

Conflicts:
	.gitignore
	routes.py
	web/templates/home.html
finished merge (the merge that moved web things into a web dir)
removed old static dir
moving flask stuff to a subdir creates more complexity and doesn't give us much at this point. keeping it in root. we can adjust next pass.
bit of code cleanup
Merge branch 'develop' of github.com:harvard-lil/linky into develop
wrong flag to wkhtmltopdf. fixed.
framed out api request
Merge branch 'develop' of github.com:harvard-lil/linky into develop
integrated api for image creation
reworked rendering to use phantomjs.
started playing around with hashes
Merge branch 'develop' of github.com:harvard-lil/linky into develop

Conflicts:
	etc/linky.example.conf
	routes.py
cleaned up a bunch of little path/config bugs