progress in alignment
the facebook regex was reverted at some point. It's been fixed again, maybe?
Merge pull request #89 from SonOfLysander/master

Some additions