AWS, HAMLising, Twitter Changes and things.

Commits from the 12th and 13th