Merge branch 'master' into esegev
Merge branch 'master' into esegev
Merge branch 'master' into esegev
Added about stuff

Feel free to tweak the titles, Arjun
Merge branch 'esegev'