changes to jqueryFlipster, sidebar, and posts
added to .gitignore
resolving conflicts between master and dev_liz