Merge branch 'master' into feed-author

Fixed wrong author name in feed.xml

Merge pull request #70 from simathur/patch-1

Delete Gemfile.lock

Delete Gemfile.lock

This file was added to the .gitignore recently, but hasn't been deleted from the code line.

Change link name from email address to just "Email"
- Fixes #68

Update license

Make it generic

Add alternate bio photo for testing purposes

Add optional email address to author bio and feed.xml
- Fixes #35
- To add additional social network profiles edit _author-bio.html
- Icons come from the Font Awesome webfont. See http://fontawesome.io/icons/ for a complete list

Ignore

Remove

Update

Update

Page cleanup

Toggle paragraph indentation on and off.
- On by default

Remove Google fonts from head and include as .scss partial

Install Octopress to create new posts/pages

Ignore .sass-cache

Convert .less to .scss

Replace sitemap.xml with Jekyll Sitemap gem