Update bio
Update intro
Remove flickr and vimeo
Add link to talks
Move html styling down
Update link to Rulu 2012
Update location
Add bustop.ca
Add etter link
Link was the other way around!
Merge branch 'heroku'

Conflicts:
	assets/pcreux.scss